merge trunk
authorK. Handa <handa@gnu.org>
Sat, 20 Jul 2013 11:51:53 +0000 (20:51 +0900)
committerK. Handa <handa@gnu.org>
Sat, 20 Jul 2013 11:51:53 +0000 (20:51 +0900)
commit6feb3b7437dab2916e1c9d93447a51e580ee82ec
tree2659800ef61c5d25f7c9a17664dc4535add4321a
parent48333c2252e1fc085496060f1a6e1fe8d9178076
parent6a18a9a18a0c2810ee934db48e72cdf7b54c8d98
merge trunk
lisp/ChangeLog
src/ChangeLog
src/coding.c